Remove confusing comment about X11.

Sat Feb  3 11:28:03 2001  Owen Taylor  <otaylor@redhat.com>

	* configure.in: Remove confusing comment about X11.

Fri Feb  2 19:21:23 2001  Owen Taylor  <otaylor@redhat.com>

	* gdk/gdkwindow.c (gdk_propagate_shapes): Surround additional
	regions with HAVE_SHAPE_EXT. (#50511, Eric Ding)

Fri Feb  2 18:31:54 2001  Owen Taylor  <otaylor@redhat.com>

	* gdk/x11/gdkimage-x11.c: Remove definition of _XOPEN_SOURCE, since
	it breaks things on BSD. If you want to compile GTK+ with
	-ansi -pedantic, you should supply CPP_FLAGS=_XOPEN_SOURCE
	when configuring, since GTK+ simply can't be "pure ANSI"
	in the header files it uses. (#8170, Greg Hudson)

diff --git a/ChangeLog b/ChangeLog
index f5b6aecb484d13ce77eada4cf4200d3e0ea1c9fc..734d9f37067533b548438d4076738b9afc003730 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+Sat Feb  3 11:28:03 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in: Remove confusing comment about X11.
+
+Fri Feb  2 19:21:23 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkwindow.c (gdk_propagate_shapes): Surround additional
+       regions with HAVE_SHAPE_EXT. (#50511, Eric Ding)
+       
+Fri Feb  2 18:31:54 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkimage-x11.c: Remove definition of _XOPEN_SOURCE, since
+       it breaks things on BSD. If you want to compile GTK+ with
+       -ansi -pedantic, you should supply CPP_FLAGS=_XOPEN_SOURCE 
+       when configuring, since GTK+ simply can't be "pure ANSI" 
+       in the header files it uses. (#8170, Greg Hudson)
+
 2001-02-02  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtkwindow.c: docs

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index f5b6aecb484d13ce77eada4cf4200d3e0ea1c9fc..734d9f37067533b548438d4076738b9afc003730 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,20 @@
+Sat Feb  3 11:28:03 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in: Remove confusing comment about X11.
+
+Fri Feb  2 19:21:23 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkwindow.c (gdk_propagate_shapes): Surround additional
+       regions with HAVE_SHAPE_EXT. (#50511, Eric Ding)
+       
+Fri Feb  2 18:31:54 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkimage-x11.c: Remove definition of _XOPEN_SOURCE, since
+       it breaks things on BSD. If you want to compile GTK+ with
+       -ansi -pedantic, you should supply CPP_FLAGS=_XOPEN_SOURCE 
+       when configuring, since GTK+ simply can't be "pure ANSI" 
+       in the header files it uses. (#8170, Greg Hudson)
+
 2001-02-02  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtkwindow.c: docs

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f5b6aecb484d13ce77eada4cf4200d3e0ea1c9fc..734d9f37067533b548438d4076738b9afc003730 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,20 @@
+Sat Feb  3 11:28:03 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in: Remove confusing comment about X11.
+
+Fri Feb  2 19:21:23 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkwindow.c (gdk_propagate_shapes): Surround additional
+       regions with HAVE_SHAPE_EXT. (#50511, Eric Ding)
+       
+Fri Feb  2 18:31:54 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkimage-x11.c: Remove definition of _XOPEN_SOURCE, since
+       it breaks things on BSD. If you want to compile GTK+ with
+       -ansi -pedantic, you should supply CPP_FLAGS=_XOPEN_SOURCE 
+       when configuring, since GTK+ simply can't be "pure ANSI" 
+       in the header files it uses. (#8170, Greg Hudson)
+
 2001-02-02  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtkwindow.c: docs

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index f5b6aecb484d13ce77eada4cf4200d3e0ea1c9fc..734d9f37067533b548438d4076738b9afc003730 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,20 @@
+Sat Feb  3 11:28:03 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in: Remove confusing comment about X11.
+
+Fri Feb  2 19:21:23 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkwindow.c (gdk_propagate_shapes): Surround additional
+       regions with HAVE_SHAPE_EXT. (#50511, Eric Ding)
+       
+Fri Feb  2 18:31:54 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkimage-x11.c: Remove definition of _XOPEN_SOURCE, since
+       it breaks things on BSD. If you want to compile GTK+ with
+       -ansi -pedantic, you should supply CPP_FLAGS=_XOPEN_SOURCE 
+       when configuring, since GTK+ simply can't be "pure ANSI" 
+       in the header files it uses. (#8170, Greg Hudson)
+
 2001-02-02  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtkwindow.c: docs

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index f5b6aecb484d13ce77eada4cf4200d3e0ea1c9fc..734d9f37067533b548438d4076738b9afc003730 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,20 @@
+Sat Feb  3 11:28:03 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in: Remove confusing comment about X11.
+
+Fri Feb  2 19:21:23 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkwindow.c (gdk_propagate_shapes): Surround additional
+       regions with HAVE_SHAPE_EXT. (#50511, Eric Ding)
+       
+Fri Feb  2 18:31:54 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkimage-x11.c: Remove definition of _XOPEN_SOURCE, since
+       it breaks things on BSD. If you want to compile GTK+ with
+       -ansi -pedantic, you should supply CPP_FLAGS=_XOPEN_SOURCE 
+       when configuring, since GTK+ simply can't be "pure ANSI" 
+       in the header files it uses. (#8170, Greg Hudson)
+
 2001-02-02  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtkwindow.c: docs

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f5b6aecb484d13ce77eada4cf4200d3e0ea1c9fc..734d9f37067533b548438d4076738b9afc003730 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,20 @@
+Sat Feb  3 11:28:03 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in: Remove confusing comment about X11.
+
+Fri Feb  2 19:21:23 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkwindow.c (gdk_propagate_shapes): Surround additional
+       regions with HAVE_SHAPE_EXT. (#50511, Eric Ding)
+       
+Fri Feb  2 18:31:54 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkimage-x11.c: Remove definition of _XOPEN_SOURCE, since
+       it breaks things on BSD. If you want to compile GTK+ with
+       -ansi -pedantic, you should supply CPP_FLAGS=_XOPEN_SOURCE 
+       when configuring, since GTK+ simply can't be "pure ANSI" 
+       in the header files it uses. (#8170, Greg Hudson)
+
 2001-02-02  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtkwindow.c: docs

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f5b6aecb484d13ce77eada4cf4200d3e0ea1c9fc..734d9f37067533b548438d4076738b9afc003730 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,20 @@
+Sat Feb  3 11:28:03 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * configure.in: Remove confusing comment about X11.
+
+Fri Feb  2 19:21:23 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdkwindow.c (gdk_propagate_shapes): Surround additional
+       regions with HAVE_SHAPE_EXT. (#50511, Eric Ding)
+       
+Fri Feb  2 18:31:54 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkimage-x11.c: Remove definition of _XOPEN_SOURCE, since
+       it breaks things on BSD. If you want to compile GTK+ with
+       -ansi -pedantic, you should supply CPP_FLAGS=_XOPEN_SOURCE 
+       when configuring, since GTK+ simply can't be "pure ANSI" 
+       in the header files it uses. (#8170, Greg Hudson)
+
 2001-02-02  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtkwindow.c: docs

diff --git a/configure.in b/configure.in
index 19652b4c25d4d2e2c1132dce227a472cfd1ee7d4..0f01d7886dcb172f8ac99f80541e8cea1fa55b20 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1109,7 +1109,6 @@ _______EOF
        fi ;;
 esac
 ],[
-# Currently we always use X11 on those systems where we run configure...
 if test "x$gdktarget" = "xx11" ; then
   gdk_windowing='
 #define GDK_WINDOWING_X11'

diff --git a/gdk/x11/gdkimage-x11.c b/gdk/x11/gdkimage-x11.c
index cfdb569ca5e666e4247ba4e6aa0a589626f0b1dc..4fe54dd09e81e91e5419aec18bc7570affb273a1 100644 (file)
--- a/gdk/x11/gdkimage-x11.c
+++ b/gdk/x11/gdkimage-x11.c
@@ -26,14 +26,6 @@
 
 #include <config.h>
 
-/* gcc -ansi -pedantic on GNU/Linux causes warnings and errors
- * unless this is defined:
- * warning: #warning "Files using this header must be compiled with _SVID_SOURCE or _XOPEN_SOURCE"
- */
-#ifndef _XOPEN_SOURCE
-#  define _XOPEN_SOURCE 1
-#endif
-
 #include <stdlib.h>
 #include <sys/types.h>
 

diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 8f782aafbe550775a0c09bd9448ecff232c746f5..a68b2be56ad05bc1338adcda1c125b27c37b0a94 100644 (file)
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -1988,6 +1988,8 @@ gdk_window_set_functions (GdkWindow    *window,
   gdk_window_set_mwm_hints (window, &hints);
 }
 
+#ifdef HAVE_SHAPE_EXT
+
 /* 
  * propagate the shapes from all child windows of a GDK window to the parent 
  * window. Shamelessly ripped from Enlightenment's code
@@ -2300,6 +2302,8 @@ gdk_propagate_shapes (Display *disp,
   g_free (spans);
 }
 
+#endif /* HAVE_SHAPE_EXT */
+
 void
 gdk_window_set_child_shapes (GdkWindow *window)
 {